From 97903a318300099bbce363c791cdc35286285f3f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 17:33:22 +0100 Subject: [PATCH] Generate a dependency on libgtk-4-0.9400.0 since the ABI is not yet stable --- debian/changelog | 2 ++ debian/libgtk-4-0.lintian-overrides | 4 ++++ debian/{libgtk-4-0.symbols => libgtk-4-0.symbols.in} | 2 +- debian/rules | 10 ++++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 debian/libgtk-4-0.lintian-overrides rename debian/{libgtk-4-0.symbols => libgtk-4-0.symbols.in} (99%) diff --git a/debian/changelog b/debian/changelog index 57f60a5901..4d7c6356a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium * d/tests/build: Update for GTK+ 4.0 * d/missing-sources: Remove, no longer needed * Fix generation of README.md.gz symlinks + * Generate a dependency on libgtk-4-0.9400.0 since the ABI is not yet + stable -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/libgtk-4-0.lintian-overrides b/debian/libgtk-4-0.lintian-overrides new file mode 100644 index 0000000000..f2931edbc3 --- /dev/null +++ b/debian/libgtk-4-0.lintian-overrides @@ -0,0 +1,4 @@ +# During Gtk 4 development, every release breaks the ABI. For now we use +# Provides: libgtk-4-0.whatever instead of renaming the binary package, +# to avoid regular trips through the NEW queue. +libgtk-4-0: package-name-doesnt-match-sonames libgtk-4-0.* diff --git a/debian/libgtk-4-0.symbols b/debian/libgtk-4-0.symbols.in similarity index 99% rename from debian/libgtk-4-0.symbols rename to debian/libgtk-4-0.symbols.in index 7004c601b8..b0783e446a 100644 --- a/debian/libgtk-4-0.symbols +++ b/debian/libgtk-4-0.symbols.in @@ -1,4 +1,4 @@ -libgtk-4.so.0.9400.0 libgtk-4-0 #MINVER# +libgtk-@APIVER@.so.@SONAME@ @SHARED_PKG@ #MINVER#, libgtk-@APIVER@-@SONAME@ gdk_anchor_hints_get_type@Base 3.91.2 gdk_app_launch_context_get_type@Base 3.91.2 gdk_app_launch_context_set_desktop@Base 3.91.2 diff --git a/debian/rules b/debian/rules index 5d40ba7334..5aa1e4da17 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,13 @@ binaries := $(shell dh_listpackages) LDFLAGS += -Wl,-O1 APIVER := 4 -SONAME := 0 +# The library is packaged as though this is its SONAME version (which will +# be true for the GTK 4 stable release), to avoid going through the NEW +# queue a lot... +FAKE_SONAME := 0 +# ... but while it's in development, the SONAME version is really this, +# changing with every upstream release +SONAME := 0.9400.0 LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH) @@ -33,7 +39,7 @@ CONFDIR := etc/gtk-4.0 MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION) # package names -SHARED_PKG := libgtk-$(APIVER)-$(SONAME) +SHARED_PKG := libgtk-$(APIVER)-$(FAKE_SONAME) COMMON_PKG := libgtk-$(APIVER)-common DEV_PKG := libgtk-$(APIVER)-dev UDEB_PKG := $(SHARED_PKG)-udeb -- 2.30.2